Idle & Active power rework and defines #2632
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kapu1178
reviewed
Jan 11, 2024
Thera-Pissed
changed the title
|
I forgot that machines can move between areas, whoops |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Sorry, your pr got kind of buried over and over and I haven't heard anything of it in discord, I'll check this out this week. |
Signed-off-by: HelmCrab <[email protected]>
|
finally got around to fixing the merge conflict, should be good to go again |
FalloutFalcon
approved these changes
May 22, 2024
FalloutFalcon
added
the
Code Improvement
shiptest-server
pushed a commit
that referenced
this pull request
May 27, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Jun 1, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Implements new defines set in power.dm for nearly all machines using idle/active_power_usage Kills auto_use_power() in favor of useStaticPower() procs Standardizes power draws for most things using said defines Decreases power used for lighting by half Generally increases power used by machinery, especially those that are only active for short periods. SSUs now consume power when decontaminating, ORMs and vending machines now take idle power.  If you have any feedback, feel free to share it! Most of these numbers are based on their original values, so definitely could be changed. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game This PR standardizes the draw of most machinery, while making it easier to change power use across the board. Additionally, lighting takes less power, while actual machines have been tweaked to fill this gap. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: tweak: SSUs draw power to decontaminate balance: lights no longer take 60% of a ships power, machines use more to account for this. code: added standardized defines for power usage /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: HelmCrab <[email protected]> Co-authored-by: FalloutFalcon <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Implements new defines set in power.dm for nearly all machines using idle/active_power_usage
Kills auto_use_power() in favor of useStaticPower() procs
Standardizes power draws for most things using said defines
Decreases power used for lighting by half
Generally increases power used by machinery, especially those that are only active for short periods.
SSUs now consume power when decontaminating, ORMs and vending machines now take idle power.
If you have any feedback, feel free to share it! Most of these numbers are based on their original values, so definitely could be changed.
Why It's Good For The Game
This PR standardizes the draw of most machinery, while making it easier to change power use across the board.
Additionally, lighting takes less power, while actual machines have been tweaked to fill this gap.
Changelog
🆑
tweak: SSUs draw power to decontaminate
balance: lights no longer take 60% of a ships power, machines use more to account for this.
code: added standardized defines for power usage
/:cl: